Class enhance