Refactored TomTomProvider