Updates and enhancements