Allow better configuration