Draw Provider moved to separate class