Numerous changes, added obieeCatalogRoles