Fixed an issue with retrieve extras on classes.