Bug fixed, add new providers