Fixed issues with class privacy