Move few functions to provider utils