Adding Roles / Updating the functionality for WorkFlow