More updates to route class