Added class visibility declarations