adaptions to WAT interface changed