Added conversion functionality