Further plugin work.