Refactor to send data through collection fetch