Design Update - Class definitions