Corrected the Class scopes