Revert "Initial modifications"

This reverts commit 28a67bc32900f41d2646e0a866f54c4cdb413a57.
UserRoles
Revert "Revert "Initial modifications""

This reverts commit 255424d07c8076b6246863f5c1bb6ebc476d985c.