Added types map