Move extensions outside of SPSSODescriptor for Roompact