Optimizations in EditTask and Added timer events