Add Provider support