Added more Wall related code