Minor changes - Waiting for logging plugin