Modify plug to work with DBX refactoring. (Working.)