Added maps and map types