Added more convertions.