Added "ALL" option & more sample data