Updated Routes just to include the keyword if the client exists.