More visibility refactoring
Documentation