Added VB support