Update with latest TileEntity optimization changes