Added more visibility targets