Some changes in files due the refactor