More refactoring of ProjectMetadata