[IMP] Better retrieve error
[IMP] Better to use update when adding multiple key in a dict