User and DbContext refactured