Add support classes for 1_7_R4