mde enhancements for Unique directive