More improvements in architecture design