More user defined function support