setSource method tweaks
Merge branch 'source-type'

* source-type:
  setSource method tweaks