Additional design improvements