Merged model classes as discussed in meeting