Added parser implementation