Add classname support