Updated format to take MIME Type

Closes #117