Add more configuration options (again)