MDL-5583 mod_data: Improve required fields