Add todo - support nowait and adopt