(core) WIP refactoring data capture