Combine some repeated classes