Adding suport for visibility