Upgraded the new plugin architecture
3.0.3