JAL-3033 and more classes for examples core