Revised tracking of enabled entries