Refactored to use new CustomMaker proxy support in Jython