NAMESPACE change - S3 classes definitions