reworked wrappers to use provider apis