Added new providers and some bug fixes