GWTII-128: final api changes + added logging