Update todo after finishing AZ feature