[#899]: Add support for deprecated elements