refactor: simplified ResolveWith