Fix content transfer bug. Content transfer API improved.