Upgraded to new version of vcommons