Same methods added. Refactoring.