More work converting plugins.