Fix:Build:Better bundle building