Add more loging