Add current codelists
Standardise second level elements