Improve some classes