Fixing some bad OO patterns.
#52 Memorized DataProvider's during deploy.