updates for new warden API, make more possible to parallel