Refactored Value into a proper struct