Improved bundle loading