Updated functionality for data-collecting purposes