User-goals-api changes