Update Data Router to support API V1