Adding logging capabilities