Changed database tables structure and created new domain model