Added new domain objects
Created tests and first implementation