ER-31 - Added Encounter type and form uuids