Add slide Fix manual mapping for GAVs