Better handling of higher volume data