CE-278 Adding logging