Added code for basic bundle creation