Some updates for IDE