Reworking provider helper