Some enhancements