Review fixes. Added back contentType, but better handling for local file system usage