Feature/7 usermodel v2