Added lookup functions for classes