[REFACTOR] Follow last commit