@apatrida Yes, that new resolvers looks good! I was thinking about moving it into that direction too, and glad to see it implemented! Thank you!
I probably will have som remarks during thorough review, when you’ll make it into final PR, but it definitely looks like right direction.