Some logging added