Feature/add conversions