Changes needed by BaseLocation interface evolution