Widen the current Visibility API to support all entities