Additional comments added to Classes and Structures