Make configuration more generic