Improve efficiency of visibility methods