Change Dictionary's type from plain map to struct