Added router class