Work in progress on setting medication model fields for E2E