Several methods now return an Integer instead of a ValueHandler.