ACTIV-30 - Enhance logging