* Update along with latest Vamp API change