Conversion functionality moved to module