reverted back to pure ID and MD plugins