Re-work %yplan mapping and update