Added preliminary support for a source parameter