Allow for waiting timeout to be overriden