Updated AMV workflow