#87 Add new format and auto replacement depending on format