Changes in some classes