Google Maps announced a new update on Tuesday designed to deal with more complex routes than simply driving from point A to point B. A handful of upcoming features will make it easy to stop for gas or at the grocery store without having to re-type your final destination.

If you’re in the middle of a trip and need to stop for something, just hit the magnifying glass icon to pull up a list of common options like gas stations, restaurants and grocery stores. Pick the one you want and Google will add it to your route as a pit stop automatically.

The updated app will also help you find the cheapest gas along your route. Once you realize you’re low on fuel, just let Google Maps know and it will bring up a list of convenient options along with the current price at each location.

The latest version of Google Maps should be available on Android within the next few weeks. Google doesn’t mention an update for iOS, though we assume that’s in the works too.