Initial WHSuite changes (fixed)