Various design improvements