Various fixed, S3 class import