Converting to experimental plugin architecture