Fixed Route class and merged changes.