Logging Support added