Added support for 'source' url parameter