Added Converter Service and tests