added support for _source field