Add first version of parser