Add support for delegates