Added and improved routes