Re-architectured (again) and partial blanks support