Enhanced todo