Added type conversions