Updated class functions