removed generics from Xclasses