Enhancing all the classes for multi threading