Update parser

Signed-off-by: Angel Hitov <angelhitov@gmail.com>