Fix refactor added