ENH: Updated code with new CurveMaker API