Added missing extra-source-files
New parser (incomplete)