Few enhancements