Fix cli runner
Add migration for count fields
Collect more data