Add changes for visibility flag