Merge old plugin functionality into new framework.