Options should definitely move into core if they are useful across planners