Add provider fields
Fix build gradle