Refactor Reporter to be more Promisy