Simplified character components yet again