Make configuration use objects