Fixed structure, added list of file extensions