Added ability to specify source name for scanner