Some changes for new IDE 4.0