Added two more model classes and server database classes