Improved value resolver