Started to move as as per single responsibility principle.