Add converter also to marshaller
Use constructor to avoid default init