Add conversion facilities (WIP)