Reduce assembly redundancy