Modified classes that require threading to use the new implementation