Some better configuration options