Added device enumerator with caps