Improved js bundling