Restructured RiotParser