Fixed a type that prevented import.
Changed interface registration to take advantage of the fact
that we have classes.