Faster Value.load
Clean up code by OldValue class
Add none requirement