Adding support for visibility