removed xcuserstate
Added base classes