Correct class access all over project