New classes and fixes