Route class added, minor fixes