Waila Support and Fixed NBT