Add more providers - issue 7