Added class name String, redesign