Refactored domain model to use Guids