Rework configuration loading to avoid the additional hash