#109 Deprecate XML definitions