Feature/metadata updates