Dependencies Update & Routes Fix