Extra logging added