Changed plugin interface again, after some persuasion