Add some additional changes