Preparations for concurrent loading
Fixed #9.