Refactored value loading