Added custom converters, broke out converters to own class