Further enhancements