Updating parser
Signed-off-by: Itamar Bar-Lev Shapira <itamar@gizra.com>