Added core of parser