Add RequestValueResolver
Rename resolvers