ADDED - 
1. Minor changes to all the class definition