Simplify assembly configuration