Updated to latest API methods, fixed inclusion