Added to Maze and Pillar.