Added support for choosing providers.