improve Dictionary usage