Updated bindings to relfect changes from 3.0 up