Can we do this as a follow-up issue? We already touch too much with this PR