Add specs for explicit visibility setting
Adjust metrics