Added Xclass migration