Updated NbtFactory