Fix speed
Add user model