Some further enhancements