Cosmetics changes & add roles namespaces