Fixed roles and added tags