Adding routes and returns for challenges