Update accordingly to the latest changes in ide project