Update to use the builtin buildr addon