Add support to only update certain fields