Better to not unmarshal the schema dependent source.
Merge pull request #133 from birkirb/master

Better to not unmarshall the schema dependent source.