User Story 1025 (issue #8)

Do the code review on this requirement.