Added better update for dicts and fixed optional exclude