Better pending actions implementation