Fix: Check id field are mandatory