Cleaned up Zest by using providers