[PATCH 01/16] Split completed and mandatory attributes