New version with plugins