(refs #32)Improving plug-in API