Initial refactor of extending root level metadata
Missed commits