New classes, cf issue #103