Refactor road management