Added User model and other configuration changes