Reverted to each type having it's own sub route.