Added more loggin capabilities