Added more conversions.