Added VPAID support