adapted fields to the new administrative layers