Porting to new version of Wand