Redesigned Plug-in architecture