Upgrading to use NeoBundle