Improvements to data gathering.
1 file changed