Updated with new maze definitions