Add more work on user model