Extending the design for the A* funcitonality