Upgraded dependencies (AFAP)