added proper support for bundle types: plan, par