Addition to refactor