Added several value resolvers