Adding stubs in for AVP2.