New structure of the entities except school