added suport for modules in the parser