Comment out isinstanxceof in domain class helpers - causing probkems