Various enhancements