Fixed acces modifier, more work to other classes