Added 'timeout' configuration setting