Changes for gathering sample data types