Adding tools to fix datetime dict issue