Add forgotten sources in change c4a8824 Add support for user functions