Added wrapper, mode option and uniqueid