Added Shop and ruduced number of domain model classes