Add target attribute to Plan.
Update plan-related classes to use target.