class: Changes for the implementation of class Class