Added class format types