Make Bundling less restrictive on item type and add item helper