Add class attr support