Add more visibility flags