Changed maze class