Made compatible with refactorization