Consolidate class