Changes for task synchronization