Moved back from plugin to workaround complex dependencies.
Will wait for ERD fix.