Added class attribute support