Add better defined configuration options