Added existing modules and parser module