Adding router functionalities