Adds Supported Content Format Enum and some little improvements