Some design updates