Add validator to getDirectRoles
Clean up