Added full set of content source and other metadata

Fixes #51