Small code changes for routes module