Splitt logic into own converters