Rest Changes to support visibility labels