Good point. I think in the meantime we could refactor to a non class version. I will create a separate issue for this.