Added source detect support
.