The converter could be refactored to be more flexible (using the crosswalk table) and less hardcoded. There are a number of things than could be done at the same time.