Changed some small details for data analyses use case