A tweak for bug #7558. I added a couple of classes to the interface.