Add constraint resolvers