Worked on building separate parser