Cleaned up SecurityPrincipals, added VulnerabilityCatalog