Added more reliable write support