Refactored some roles & modules