Add support for wall wraparound