chg: extracted generic functionality from Resolvers to Helpers