Adding Logging capability