Resolves #17 - medHPO-17 Custom Terms