Support AVA2_P_WORK