Update to work with latest NBT build