Fixed parser, changed way to retrieve arcs