Updated SourceDoce Structure