Update for VVV compatibility