Move Visibility Query into separate class