Systems refactored, dcterms used