Improve class