Added initial version of parser