Refactor the FLAC module and add additonal common fields.