Issue #2236733: Goal-related methods should be in a separate interface