Make resolvers work with state object directly