Move convert methods into the enums