Added Class attribute support
Added class attribute support