Added consistent and configurable timeout values