Changed attribute names, handled double-way paths