Modal enhancements