Design Update - Class Definitions