Added a Interface for the parser
Made a few corrections