CFY-1000 moved provider base class to a different file