Improve Value implementation