Updated classes and added notations.