Refactor
More plugin work was done.