Complete - task : Add Logging