Add converter, fix checker