Added Bootstrap and random generator