SImplify the domain model to have only one Property class.