Rename caller to sender
Add support for blocks