Added function_signature and function_signature_raw to cross_function and custom_cross_function