Better configuration options