Updated Compact mode, Support default mode