Starting to implement experimental plugin system