Expanding the domain model, basic implementation