Added some missing attributes to space and org