Added class and style attributes support