Added type and genericType to ValueResolver.lookup