Add method to view Descriptors as dependency
Fix accidental dependency to impl class
Make class package private