Phase 2 - Expanded User Entity with more options and abilities