Added user model and updated adapters