Classes: added, modified