Update user model to combine with normal db context