Update for API change (add "Custom" in method names)