Added conversion feature