[new] Design improvements