Implemented domain model
Added some more properties