Some design improvements v2