Issue #2325757: Convert goals to non-fieldable entities