Added several configuration options