Refactored value structures