Bringing back the resolvers :)