Yet another round of design improvements