Add some more stuff to CGFunctions