Fix new polymorphic way to send data