Improve classes