Revert "Revert "Add more D2011 parsing""

This reverts commit 002012390d8da09cc895c54af7c8b122c1663b77.