Added basic bundle structure