Updated data gathering