Prepared source function calls to be consistent with binary function calls
Added binary function calls