Modified: improved plugin architecture