Add debug wrapper and data collector