Add bundle-saving stuff