Continued work on the data collectors