1. Removed named query
2. Added Role Master