Update class and definitions