Added support for NBT