Added 6.2 compatibility with new xclass-config