Further possible enhancements