Finish the conversion to enum