Preparation for multi-threaded usage