Some design improvements