Add final enumeration check