Added Media Type and some other minor goodies