Update Role Control to query for roles correctly
Update models to use new version of controlcontrol