Switched to using a plugin interface.