Updated routes to work with DB and not test dictionaries