Updated classes methods

Updated classes methods