Master now uses plugin architecture