fixed user model and types