Updated class utilities