Added new configuration options