Add ability to filter the data quite easily