Revert "Revert "Fixed visibility of methods - partial commit""

This reverts commit 65deae1b147f463e103d2caebeaafd67735109a5.