Improve data collector