Changed main routes to be consistent with the 'result' structure