Further improvements and enhancements