Issue 46: Consolidate plugin