More NBT work