standardise api with new wrap module