Added Source-Element parsing