Added list enumeration checks