Content source support (issue #20)