Updated and added more samples