Updated Class Design