Resolve #2: improve performance while retrieving large data samples