Removed More roles
Added all changes