Correction and added all types.