Add tank, better saving of NBT data