Handle urls/paths better