Added uniform and random sampling