Fix classified and modify tables