add support for `to` field