More XML classes for S3