Included new classes for concurrency issues