Added to generate domain model