Add some classes and changes.
Changes with code review.