Implement new visibility rules