Some changes in base files