Improved config load