Added snapshot resolvers