Add more loggin