[#899]: Add support for deprecated elements
Merge pull request #916 from mvriel/899

[#899]: Add support for deprecated elements