Add PVar support