Refactor Highway model
Fix routes