Extracted roles into two namespaces.
Extracted roles into two namespaces.