Changes to implement walker