Issue #2236745: Goal-related methods are now part of a different interface