Add uniform and random sampling