Working maps, changed user model