Redesign of class