Changes for larger datasets