Added Master personal space. Switched to global types in Catalog