Some changes because of the refactoring