Updated plug-in architecture