added more domain objects, not sure if they are correct, but I tried some mappings.