Few enhancements for the IDE