Added visibility field