HCOLL-89 refactored logging