Class and Message redesign.