Updated for IDE UI changes