More SpaceTypeDescriptor Refactoring v2