Improvements, include other classes