Load configuration improvements, work in progress