Improved loading of values