Add core subgoals