Added more conversions