Completed the Parsing component