Features/configurable timeouts