Convert to use model classes from routing-engine