New plugins part & removed header to use a native one