Fix backward compatibility, fix concurent modification exception and make timeout workspace configurable.