Use more strict file format