Hooked up the parser to use the new format for module