Todo: register all to DF; finalize ws Stub behaviours