Configuration improvements