Added retrieving classes