Added class vars scopes