Updated the method signatures to work with 0.10.x, WIP