Improve class table