Refactor zebramaps parsing