More route optimization -hashmap + arraylist