Some more enhancements