Visibility refactor for use in Beta4 projects