Moved Abstract Health Data into HealthDataTrait
Clean up in ORM Mapping