Add all other roles and better role management