Added visibility options