Ok we were waiting for this confirmation, I will refactor based on that.