Small changes so that A* can use interface