Move conversions to its own class