Additional changes in Class Design