Api provider refactor

2 Thumbs up...