ContentId refactoring, separated in factory and implementation.