Refactor utilities.
Add plugin code.