Collections with visibility

This is only necessary since Visibility is now providing scopes