Modifying the signature of functions to pass the neighbor mapping arguments