Adopted for source format 3.0