Updated headers of NBT impl