EZP-22210: Updated and improved spec