Added mapToDictionary