More feature enhancements