Bundle updates and adding build only functionality