New classes ported from Kisma