Added class-related utility functions