Moved Dictionary generation methods to Map.tt