Add refactors