Added new classes to show the new parser design