Several design improvements