Some design improvements v3