Reformatting HybridRoleManager and DatabaseUtil classes