Fix data modeling for routes