Added more to retrieval of specific classes.