Add support for normal functions to courier