HCOLL-74 refactor