Update Roles

Please, review and let me know if its okay. :)