Add Media Upload Support & Add Some Exceptions