Added parser and unit test