Several design updates