+1, let's go for this in this PR.
But this listener is still weird to me, we will need to address it later.