Added more plumbing for Tile Container