Walker class was removed, added back in