Modified structure of Users to remove if in
Removed StateManager entirely