Further updates for handling new surface structure and border cells