Add function-override-with-wrap