Added Device and Enumerator classes.