Data class XML fix