Update class names and add signature area