Add strm support; Pre-delete + payload options; Improve retry behaviour