Improve class system