Added default-wrapper-fn