Add support for hidden / closed spaces