Added User model and some stubs