Modify client library to comply with MIME revamp