Added base code for bundle