added proper type information to maps