Improve support for new_ticket_location