Added distance parsing (untested)