Added more conversions for type-classes