Updated to API version 10 and improved logger