CAL-861 format code and add more default serial id