[fix] Added missing changes to the previous refactorization