Updated for plugin architecture.