Added conversions and more type variety.