Added field specific query
Added distributor