Made routing more flexible, no need for index