added several configuration options