Changes to few classes, nothing specific yet