Should we use the actual class name here rather than a string?