Adding state-of-the-art true enumeration support!