Extended enums to support content providers and removed unused code from auto-gen content providers