Added support for supplying a function for content