Added visibility classes