Add xvp support