Added structure for convert and relations