Refactored the roles & permissions to reflect new situation