Added option to only return certain fields