IDE Updates

Please incorporate with your IDE changes. Thanks.