More work on plug-ins