Move new stuff to v2 routes